Squashed 'merlin/' content from commit 433bcef

git-subtree-dir: merlin
git-subtree-split: 433bcefb1869431761737d95b9f9a86bfc6c0f22
Merge commit '2213bd0710609710f0dd16d55c42d18cae4e8ff3' as 'merlin'