Merge "Improve Release Notes and Template references"