This issue is closed as solved by, but I'm not sure by what issue, could you indicate it? Is it solved by both issues? (in which case, XWIKI-21492 is currently not finished).