Merge string-templates
branch to master
#3660
Merged
string-templates
branch to master
#3660