close #561117 in changelog