The pull request https://github.com/xwiki/xwiki-platform/pull/1504 (which is actually related to XWIKI-18272) was committed with the wrong id.