Synced to hg-origin.