Merge pull request #996 from Diapolo/tx-lang-upd