Merge branch 'unique-app-id' into 'develop'