Merge tag 'v2.0.4'

2.0.4
Update config
Bump version
Merge branch 'release/2.0.5' into production