Implement CQL to CCL fieldmap, bug #4336