check in upstream patches