Backport !16060 : injector: clear is done through a request instead of directly in the state
Backport of MR !16060 (merged)
git cherry-pick --ff 1ac42cf68aabc13c6ba91a93582c2960e63d8ca0
No conflict
git cherry-pick --ff 1ac42cf68aabc13c6ba91a93582c2960e63d8ca0
No conflict