Merge changes made in revisions #r9405 to #r9467