Merge branch 'cpp_devel' into devel

10 jobs for devel in 18 minutes and 52 seconds (queued for 1 second)