DF#QCADOOMES-1908 fixes