see commits messages
Draft status: To be rebased (should be trivial) and merged only after !812 (merged) is merged
Reviewers: @v.friese and @d.smith ? (not assigning as both approval needed in my opinion)