Ticket/8319 develop version

Olympus: https://github.com/phpbb/phpbb3/pull/1459