Sth/kcm 5496 (#3732)

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>
Signed-off-by: aaliomer-ibm <aaliomer@ibm.com>
Co-authored-by: Jay (Ayad) Aliomer <aaliomer@ibm.com>