Merlin: update to 1.7