[MERGE] Sync & Merge recent upstream patches