Merge "[COMMON] New affinities templates"