- Some cleanup and internal refactoring around new encoding and decoding logic
Merge remote-tracking branch 'origin/master'