Merge revisions r181919:183444 except for r182099, r182650, and r182683.