Update JS toolkit to master