Merge changeset 11123 from the trunk