WIP: Issue 1047 prefill everywhere

This contains #987 and should be reviewed after it.