Daily "22.0 to master" sweep: 10/06/22
This is the manual sweep of MRs from the 22.0 branch to the master branch for 10/06/22
No conflicts.
Reverted commits 7041b3d5
and 44dd1a66
because the relevant MR-s on 22.0 are marked as sweep:ignore : !54138 (merged) and !54165 (merged)