Shortened template var name
Merge branch 'master' into raf-dev