Sync feature/string-templates
branch with master
#10360
Annotations
20 errors and 5 warnings
feature/string-templates
branch with master
#10360