WIP for #4743