Merge "Subnets should be set as lazy='join'" into stable/havana