Merge branch 'jv/merge-nothing-into-void'