Update patches on top of latest master