Revert "Merge branch 'hotfix/lazyload' into 'master'" This reverts merge request !957 See merge request !958