Refactor #10071 done