squash 15 commits of js into 1 commit
Merge branch 'temp' into js