Catch-up merge from master/...@184830 to nailboard branch.