TABDEV-3392: fixed some redundancy, and also some redundancy
Merge branch 'TABDEV-3392' into develop