Add changelog entries for #5006 & #5009 [ci skip]