Merge 13831:14550 from trunk