Bring up-to-date with latest HERMIT