Merge "Get rid of dependency on owning_ref." into main