Fix js import path
Merge with master