SC#QCADOOMES-1816 nbl add tab workstation
merge conflicts