CHANGELOG 2.0.5-RC4
Merge branch 'release/2.0.5-RC4' (early part) into develop