[CHANGELOG] #3096 #3073

#3096 
#3073