There is a bit of confusion and an unintentional hijacking of this topic for seemingly similar but unrelated problem.
When this issue was reported #2cb805a683 was the latest version.
I can confirm that commit #8d69944 indeed fixes the issue in the OP and this topic can be closed.