Merge "Improve templates and add references in guides"