r2960 - maintenance->trunk sync of changeset:2953