Extended support for Transactor 1.2
Merge commit 'dcf33ca' into master