Pull Mamba's updates into the dev branch