Feature/ddf 818 config list fixes