Merge pull request #11313 from daleckystepan/bb-resolution