Merge pull request #39926 from barredterra/bt-precision