Smaller template update
Merging