port changelog for 2.1.4 to master (#4031)

1 file changed