Merge branch 'hotfix/2.3.4'
Fix js asset path
Merge branch 'hotfix/2.3.5' into develop