fixed
Merge branch 'refs/heads/hotfix-assets-load-v2'