Provisional fixes until js-refactoring not being released
Merge branch 'feature/js-refactoring' into hotfix/next