Merged to v9_11 branch:

4605.   [performance]   (partial backport) Improve general query
                        performance. Improves performance of owner case
                        restoration, hash function, etc. Uses inline
                        buffer implementation by default. [RT #45637]

		Mukund