Sync with update

Merging with original files.