Merge js from master