Fix js error from premature js import
Merge branch 'feature-bootstrap-js-imports' into feature-bootstrap