Merge branch 'ef/maint-fast-export' into maint