Merge branch 'tr-integ' into debian