Merge pull request #8497 from jaimeMF/lazy-load