Merge "Rename prop_bt." into main