merged with master
Merge branch 'transaction-check'
chimney & upgrade recase