Merge pull request #5616 from juliantaylor/backport-1.9.2

more backports for 1.9.2