Merge branch 'fix-bad-search-ordering' into release