Merge pull request #1823 from mariocynicys/expose-tlv-macros2