Upgrade version number
Merge branch 'release/2.1.04' into develop