Merge pull request #3518 from autonomys/backported_changes

Bump upstream commit with backported codec related fixes

Author: vedhavyas