Improve GettingStarted/Templates documentation fixes#3186