Merge "Add subnet_id option"