Osdi with kcore for merge

Committing kcore mostly