Merge 12736:14980 from trunk