Merge pull request #16913 from eeckstein/fix-dce-4.2