[CHANGELOG] Update according to last change
Merge branch '2.0'