Merge "Tempest: Fix cleaning of subnets"