Committed fix to master. Needs backport to 4.3 / 4.2 but the code is a bit different there.
Tested - it works

—
Reply to this email directly or view it on GitHub.