Support for default URL suffix
Move files to the correct location
Update project settings
Merge upstream
Merge upstream