merge changeset 9443 in branch