DF#QCADOOMES-2166 QCADOOMES-2165 fixes