ChangeLog: refreshed with latest cherry pick for v4.2.3