preparations for local installs of user apps
Merge branch 'develop'