Add patch files for PR conf/178611