SC#QCADOOCLS-3119 and minor fixes