Update Macaw to latest version

Closes #8546.