Merge "Enabling Apex in BT" into tm-dev