Recovered old changes in changelog, lost on merge from RB