PR for the last part of the ticket opened at https://github.com/xwiki/xwiki-platform/pull/2992