Started a draft PR. I'll keep an eye on the status of block for this issue and update it asap.
https://github.com/xwiki/xwiki-platform/pull/2866