Combine the queries in ::loadFromSharedTables() and ::loadFromDedicatedTables()

This reverts commit d67fc3768112ce05f8c92763a96145cc38fd8f15.

Closes #3561960

Merge request reports

Loading