Merge branch 'tx51-bugfix' into karo-devel