Merge branch 'hotfix/fix-js-bug'
footer
Merge branch 'hotfix/footer' into develop