Merge branch 'hotfix/v0.1.0.1'
Merge branch 'release/0.1.1.0'
Replaced bad placeholder tokens with correct syntax
Merge branch 'hotfix/4093-generic-name-tokens' into develop