Merge branch 'cell-designer-fix' into 'devel_15.1.x'

Cell designer test fix

See merge request !1245
34 jobs for devel_15.1.x in 63 minutes and 10 seconds (queued for 1 minute and 6 seconds)