Merge "[COMMON] New templates to handle repositories"