possible fix to app crashes
Merge branch 'develop' into staging