Merge branch 'kevin-chbind' into tr-integ