FORGE-1114: Support for multi-step wizards in Shell
Merge branch 'features/FORGE-1114' into 2.0