Merge branch 'tx53-bugfix'