Merge branch 'merge' into 'devel_15.1.x'

mirna fix

See merge request !1248
35 jobs for devel_15.1.x in 22 minutes and 56 seconds (queued for 7 seconds)