TABDEV-3458: following backported to 6.0.4
Merge branch 'TABDEV-3458' into develop