Blocked revision 796809 from Trunk (corresponds to changes made in this branch and merged back to the Trunk)