#17452 some changes