Merge "Convert port cidr splitting to str_split"