Pull in rebased patches from master-patches branch