Recovery fixed.
C# test fixed.
Merge remote-tracking branch 'origin/master' into hardcase_work