Merge 15329:15546 from trunk