forward port 2.2.1 changelog (#4167)

1 file changed