DDC-3208 - hotfix for DDC-3160 backported to 2.4.x
Merge branch 'hotfix/DDC-3208-backport-DDC-3160' into 2.4