Add changes file for #5698 and #5711.