Update temp-patch
Fix apply-patches for multiple times
Upstream merge