Merge commit 'elmarco/bt-wip'