r2968 - maintenance->trunk sync of changesets 2918, 2922, 2924~2927