Resolve #3403445 "Improve page loading"

Nick Dickinson-Wilderequested to merge
issue/term_merge-3403445:3403445-improve-page-loading into 2.0.x

Closes #3403445

Merge request reports