Merged https://github.com/xwiki/xwiki-platform/pull/2950 with a fix for a regression