Ensure -noinput
is applied correctly
#10268
Merged
-noinput
is applied correctly
#10268