I've submitted a pull request with some minor changes that will allow the code to compile on kinetic/lunar/melodic, I don't have access to merge