Merge branch 'js/maint-fast-export-mark-error' into maint