This seems to be taken care of in 8.x-4.x-dev branch and is no longer related...