Merge branch 'js/fast-export-paths-with-spaces' into maint