r2958 - maintenance->trunk sync of changeset:2920