Merge branch 'special_cep_cases' into 'develop'

Treat special cases for CEPs

See merge request !78
3 jobs for develop in 1 minute and 49 seconds (queued for 5 seconds)