Waits for pg and sg deletion propagation
Merge branch 'patience_sg_and_pg_deletion' into vanilla_improvements