Sync. changes from SF repo.