Backport 'Merge pull request #1098 from encoder32/DDC-1590' to 2.4 branch