see commits messages
Draft status: To be rebased (should be trivial) and merged only after !811 (merged) is merged
Reviewers: @a.bercuci, maybe @apuntke ?