SC#QCADOOCLS-2993, QCADOOCLS-3027 fix samples