Thomas Mortagne commented on Improvement XWIKI-14013