port 2.1.1 changelog (#3975)

1 file changed