Ticket/13073 develop

Ticket: https://tracker.phpbb.com/browse/PHPBB3-13073

This is a separate PR for develop.

Develop-ascraeus PR is here: https://github.com/phpbb/phpbb/pull/2969