Have committed to 8.x-2.x branch.
Thanks for #8 @dhruveshdtripathi.