Sync feature/string-templates
branch with master
#3657
Merged
feature/string-templates
branch with master
#3657