Merge pull request #8902 from jaimeMF/bmake