Fix for "Simplify merging of user configuration"

This fix commit 1f36b94ae37083ac28b02633b85beacf22cd2ef5.