[master] Improve templates