Add additional recovery test.
Fix test failure.
Merge remote-tracking branch 'remotes/origin/master' into repl