Merge with CF v163, fix for WebUI not being able to create apps, fix for duplicate domains