Nikita Petrenko commented on Improvement XWIKI-21705