Merge branch 'tb/test-t9810-no-sed-i' into maint