[SR-Dev] git:janakj/kcore: Merge branch 'sr' into kcore