Daily merge of 22.0 into master, Nov 1st 2022
Revert the following MRs:
!57892 (merged) Conflicts !57965 (merged) Conflicts and the description says it's acutally back-ported from master
Edited by Walter Lampl
Revert the following MRs:
!57892 (merged) Conflicts !57965 (merged) Conflicts and the description says it's acutally back-ported from master