Merge pull request #2091 from ptsekov/software-gdi-improvements