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