Thank you for working on this issue. Committed to 7.x