checkpoint: into main from release/2.2.0 @ abb10ab4405dc0f845b912c690594458284ae21e

[AmineKhaldi]

Source hash: abb10ab
Remaining commits: 3

[emlowe]

There was some problem with these changes in the release branch and I'm not sure we want to checkpoint them back into main - checking with @ChiaMineJP

[AmineKhaldi]

There was some problem with these changes in the release branch and I'm not sure we want to checkpoint them back into main - checking with @ChiaMineJP

We'll end up naturally checkpointing 82168f1 which gets us where we want to be. Am I missing something?

[emlowe]

It's probably me and not you :-)

[altendky]

My understanding was that we would checkpoint everything but no-op the removal in 82168f1. Then release does not have the feature and main has the feature, bugs and all, and it can be fixed there.

As a detail, everything gets checkpointed. The only variation is how you do it. Like making the diff empty when we checkpoint 82168f1 since that change (removal) is meant only for the release branch. But we have to record that intent in git.