Thomas Mortagne In case you want to review my changes: https://github.com/xwiki/xwiki-platform/commit/51324bc485c4c2a16268295f12107eb7764ddc4e
Thanks