fixes #16996 - reduce eager_load of tables
(cherry picked from commit 68f481c58496cae5229fc3f670840e152158b789)
fixes #16996 - reduce eager_load of tables
(cherry picked from commit 68f481c58496cae5229fc3f670840e152158b789)