Merge JS into main repo

We did this for the develop branch, but we need to do this for master as well to coordinate bug fixes between the two branches.