r2906 - maintenance->trunk sync of changesets 2886~2894