Merging latest changes to the baselayout-1_12 branch. This merge is based upon revision 1792.
Changed paths: