The search keyword is lost when using the support/discussion search. Bug #63661
Merge branch 'master' into phpbb-com
Merge branch 'phpbb-com' into develop