merge with latest master changes

1 job for !21 with csqp in 38 seconds (queued for 3 seconds)
merge request