Merge branch 'ks/verify-filename-non-option-error-message-tweak'