Scaffolding update #641