Merge commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0' * commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0': Changes for BT 2.1
Merge commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0' * commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0': Changes for BT 2.1