Merge branch 'jc/empty'