applied changeset 9676 on trunk