Rebase of Slim's BT

Change-Id: I91f847e4a05f59e13cb04124ca972a49fe67abde