Merge "Fix cidr get_attr in custom networks"