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