Merge changes @2825 back to trunk