Scaffolding update for #814