Merge pull request #23733 from alichraghi/bp