sweep various CP algorithm updates from master to 21.2
I hope this is the full collection of all MRs for which the automatic sweep failed: !56201 (merged) !56285 (merged) !56355 (merged) !57294 (merged) !56155 (merged) !57994 (merged) !57676 (merged)
Marking this as draft, as I haven't actually tested it yet.
Edited by Nils Erik Krumnack