Update Macaw to latest version
Merge pull request #8550 from vitorgalvao/fix-8546

Update Macaw to latest version