update changelog #4315 #4316