Merge "codecs: handle invalid inputs better" into tm-dev