Discussion

Tasks

  1. Rescue the code from #6084 and get it in a state where it can be reviewed.