Refactoring and Dest2 -> Dest3 for role

10 jobs for !9 with onestep
merge request