Merge "Sync release branch of cookiecutter-templates"