Merge branch 'rs/t4062-obsd' into maint