Merge branch 'develop'
do not raise exception in runmananger