Fix issue where legacy config was overriden by default config (#1489288)

Conflicts:

	CHANGELOG