[ticket/11620] Changes to match merge

PHPBB3-11620