You can find my changes here https://github.com/xwiki/xwiki-platform/compare/stable-17.7.x...XWIKI-23459 .