Merge "Also parse integer, long and boolean extras for NFC" into tm-dev