DF#QCADOOCLS-1888, QCADOOCLS-1889 nbl fixes