merge Changeset 17951