Merge "Fix to enable `--config-file` option"