Backportable search bugfixes
Spinned of from !1428 (merged) to reduce the number of commits on that MR and make it simpler to identify the bugfixes which we may want to backport to stable.
Spinned of from !1428 (merged) to reduce the number of commits on that MR and make it simpler to identify the bugfixes which we may want to backport to stable.