Update versioning for 2.0.4 release
comment
merge from 2.0