Merge "Revert "Sync from GitHub""