[ConfigManager] Fix merge config behavior
Update CHANGELOG
Merge branch '2.0'