Correct a bug with previous commit
Merge branch 'cidr_network' into dev