Code cleanup
update changelog
Merge branch 'release/2.0.4' into develop