fixing infinite loop error
fixing infinite loop
Merge branch 'develop' into no_auto_mode