Improvements have been designed in the context of XWIKI-22019. Those improvements must be implemented.