Merge branch 'js/bundle'