#21707 Remade to use partial