Add changelog entries for #2363 and #2579