[TASK] Sync with current upstream master