Merge branch 'peili/crash_recovery_tests'