2022-09-14: daily merge of 22.0 into master

Conflicts:

• !56678 (merged) unsurprisingly clashed with the 22.0 version (I kept the master changes)
• A couple of clashes with !56555 (merged)

Pinging @akraszna and @pagacova as authors