[#50893693] Add query and error count to debug toolbar
Merge remote-tracking branch 'origin/master'