[BT-31] Fix Build