Update comments about templates in common/ (must be feature/)