Merge pull request #8387 from eileenmcnaughton/bgm