merge changeset 9346 in the 4.2 branches