Merge pull request #2899 from castillofrancodamian/bmx7