Note: this work must also be push to master with a XWIKI-21702 commit message, as XWIKI-21702 is not release for 16.0.0-RC1 yet.