Ticket/12210 develop

Develop for https://github.com/phpbb/phpbb/pull/2041