[TxMt] Typeset & View branch merged back to the mainline