Split setup_and_run
in multiple steps
#1251
Merged
setup_and_run
in multiple steps
#1251