Merge pull request #11647 from AdmiralCurtiss/perfquery-inconsistency Fix PerfQuery inconsistencies across backends.
