r2957 - maintenance->trunk sync of changeset:2931