more changes to merlin core