Senky ticket/12866

https://tracker.phpbb.com/browse/PHPBB3-12866

Replaces #3074