Merge branch 'tr-upgrade' into debian-upgrade