:nail_care: from #16329 [ci skip]