This is the upstream issue for https://project.opendesk.family/projects/xwiki/work_packages/1610/activity