Update CHANGELOG.md
Merge branch 'master' into chore/private_network