Update merlin package

Sync with latest stable version.