Feature/vp 243 js merging