Merge pull request #935 from TheBlueMatt/2021-05-enum-tlvs