Commit needed for cidr port, ticket #13868