r2972 - maintenance->trunk sync of changeset:2932