set/remove flag_running
Merge branch 'develop'