Merge branch 'js-fix' of github.com:superjerms/Metakit into js-fix
Merge branch 'js-fix' of github.com:superjerms/Metakit into js-fix