The new Release 20.03 is out! You can download binaries for Windows and many major Linux distros here .
...I tested your patch and can confirm it handles both cases as expected.So I'm ok about committing your entire patch.