updated in our upstream repo - test for mirroring it on github