kcore cleanup
update
Merge branch 'kcore'