Merge branch 'feature/jQueryOnly' into develop