Merge branch 'tx28-update' into tx28-bugfix