Update CHANGES file with 6224