close #702442 with c4f047f8