r2962 - maintenance->trunk sync of changeset:2944