Thanks for working on this issue. committed to 8.x-1.x branch.