Merge pull request #14070 from eileenmcnaughton/bee_free