oops! cherry-pick the changes to changelog from 1.2.0