Add changelog entry for #4017 & #4107