Merge branch 'toshiba-bt' into release