Back Patch Changes From 9.2+

Except for the tests. They've been restricted...for now.