Refactor #10071 Ditto