Merge branch 'master' into develop
Fix key with empty value
Merge branch 'hotfix/template-with-empty-value'
Merge branch 'master' into develop
Bump version to 1.0.4
Merge branch 'release/v1.0.4'