Fixed issue with profile crashing
Merge branch 'dev'