Closes #3495678
changed title from Add a fallback for the config option to Issue #3495678: Add a fallback for the config option
merged