Merge branch 'tx28-bugfix'