Changed string substitution with the modern syntax
Merge branch 'production'