[MERGE] Syncing minor differences with upstream