Forked BT updates from tilal6991