More back-compatibility fixes
Merge branch 'feature/js-refactoring' into hotfix/next