Merge Hermes.
Fix the merge.