Merge "Rename variable of bcradio service instances" into main