Set strings properly.
Merge branch 'develop' into feature/separate-match-configs