Squashed BT commits from CM