merged changeset 9712 into trunk