Fix short echo CS in bake class templates
Merge pull request #4354 from bcrowe/3.0-short-echo

3.0 - Fix short echo CS in bake class templates