Merge branch 'wip_MDL-57590_master_forum_search' of https://github.com/mchurchward...