KCCRE-007

(@caseyniam3)