Merge branch 'jk/empty-pick-fix'