Merge branch 'hotfix/1.5.2'
fix lazy load
Merge branch 'hotfix/1.5.3' into develop