IntelliJ project files
more specific race condition handling in viewport PUT requests
Merge branch 'develop' into ui/dev