SC# QCADOOCLS-2538, QCADOOCLS-2564