3.0 - Fix short echo CS in view bake templates