[main] Multiple commands changed to allow canary steps

[main] Multiple commands changed to allow canary steps #1167