Merge bt2 branch