fix that default options overrides directly passed options to validate
Merge branch 'fix_default_opts_override_direct_opts'