Michael Hamann commented on Improvement XWIKI-16216