DF# issues QCADOOMES-2174, QCADOOMES-2217