D11 compatibility issue fixes.
marked this merge request as ready
added 1 commit
Compare with previous version