Code

Merge branch 'js/bundle-tags'