issue #20524: directly manage wiping of views