Backport KRDC fix to 10.0.1 PRODUCTION package set