Merge legacy and new main JS files, saves one request
Merge pull request #1839 from darkwing/merge-main-js

Merge legacy and new main JS files