Including https://github.com/xwiki-contrib/cristal/commit/06a6886706ebfa605ba386006b92a133fe44040a with a bad commit message