Forked to cementify changes for 1.8-1.9 compat and to improve the build pipeline, add tests