[TASK] Synchronize with upstream