Simon Urli commented on Improvement XWIKI-21993