Interim update for #846.