Fix for incorrect values returned through CIDR search
Merge branch 'hotfix-2.1.32'