Merge branch 'convolution_work' into 'master'

Convolution work

See merge request mtr/cxxbase!7
12 jobs for master in 8 minutes and 49 seconds (queued for 2 seconds)