r2941 - maintenance->trunk sync of changeset 2938