final fixes + remove restart app after start
Merge branch 'develop'