Merge pull request #964 from valentinewallace/2021-06-tlv-ser