* [templates]: sync recent changes

not new code in this commit