Issue #3495678: Add a fallback for the config option

Closes #3495678

Merge request reports

Loading