Merge pull request #12552 from mikedn/switch-bt