DF# QCADOOCLS-2089, QCADOOCLS-2061