Merge "Added mcp10 branch to cookiecutter mirroring"