onestep decision implemented based on flag

10 jobs for !9 with onestep
merge request