assets fix
Merge branch 'hotfix/assets_bootstrap_fix' into develop