Thank you for working on this issue. Committed to 8.x-1.x