Merge branch 'rs/t3700-clean-leftover' into maint