Resolve #3530965 "Implementation of lazy loading Updated Hook fixes"

Closes #3530965

Merge request reports

Loading