Merge branch 'rs/setup-use-xopen-and-xdup' into maint