Pull Moria changes