Merge branch 'adapt_to_cp_data' into 'master'

Adapt to real data

See merge request !63
9 jobs for v0.18.9 in 13 minutes and 51 seconds (queued for 2 seconds)
latest