Update patches to 9a303ebbb1846d171a7a35d7a0786ae033ba0c18