Merge branch 'tx6-bugfix'