Merge basic-improvements-branch to trunk

From-SVN: r60174
626 files changed