Merge "Add common function for cookiecutter-model generation"