Merge "More accurate function descriptions"