CIDR now recognised by freetext import
Merge branch 'hotfix-2.3.2'