Version bump
Merge branch 'release/1.004000' into develop