Version bump to 2.0.4
Merge branch 'release-2.0.4' into develop