Hopefully resolved a merge conflict #3594
New test started for config file ifdefs #4290