Tweaking logic to ensure that the app has fully started
Merge branch 'develop'