Merge branch 'jc/update-instead-into-void'