Sync with current working changes.