Merge pull request #2302 from lioncash/perf PerfQueryBase: Move common implementation variables into base class