Master-branch Sync

Sync the master changes.