merged changesets 11047 and 11050 from trunk