Merge branch 'js/fast-import-test-9300' into maint