port 2.3.1 changelog (#4397)

1 file changed