Feature/Bug: JS files loading order #893
Merge remote-tracking branch 'origin/issue-893' into issue-893