Related to DDC-2282

This is related to the patch DDC-2282, the same patch also needs to be applied here, exact same issue.