Applying hotfix for DDC-2452