merlin: Upgrade to the latest dev branch