Merge branch 'ak/add-i-empty-candidates' into maint