[MERGE] Sync Minor changes with upstream