SC#QCADOOCLS-1687, QCADOOCLS-1685