Merge branch 'jc/empty' into next