First fixes to make the module D11 compatible.

Closes #3537159

Merge request reports

Loading