GDA-5890
GDA-5890 config required
Merge branch '1.6'