Bugfix: Handle more scenario’s for —no-interaction
Bugfix: Handle more scenario’s for —no-interaction

Kunstmaan/skylab,krispypen/skylab,kimausloos/skylab,benoitgeerinck/skylab,piotrbelina/skylab,Devolicious/skylab,kimausloos/skylab,Kunstmaan/skylab,jockri/skylab,jockri/skylab,piotrbelina/skylab,benoitgeerinck/skylab,bakie/skylab,bakie/skylab,krispypen/skylab,Devolicious/skylab