Fix recovery race conditions.
Merge remote-tracking branch 'remotes/origin/master' into compress
Moved and renamed encode/decode utility functions.
Merge remote-tracking branch 'remotes/origin/master' into compress
Use common utility encoder.