[misc] Sync from master branch.