Merge ready version

33 jobs for checking-zpp-solvers in 3 minutes and 27 seconds (queued for 7 seconds)