Merge branch 'peili/crash_recovery_tests' into salsubaiee/master_fix_search_comparators