Fixed by https://github.com/xwiki/xwiki-platform/pull/6763 (master), https://github.com/xwiki/xwiki-platform/pull/6764 (stable-18.4.x) and https://github.com/xwiki/xwiki-platform/pull/6765 (stable-17.10.x), all merged.