DF# issues QCADOOMES-2044, QCADOOMES-2219