DDBEASY 151 - Conflict fix with dk5 placement overrides.
DDBEASY 151 - Conflict fix with dk5 placement overrides. Part two.
Merge branch 'DDBEASY-151' into development