Merge branch 'knapsack-for-master' into knapsack-ee

40 jobs for knapsack-ee in 564 minutes and 2 seconds (queued for 12 minutes and 35 seconds)
latest