Merge pull request #11713 from daleckystepan/cdc-fix