D11 compatibility fixes.
Closes #3450953
Closes #3450953
Merge request pipeline #225241 passed with warnings
Merge request pipeline passed with warnings for 5c42a5c0
Pipeline #226402 passed with warnings
Pipeline passed with warnings for 70730e9a on 1.0.x
added 1 commit
merged