committed b82a66d on 8.x-1.x
Thank you for working on this issue.