Thank you @fenstrat, for working on this issue.
Committed to 7.x-1.x branch ...