Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'