backport changes from V00-23-XX
sync with V00-22 branch:  Only diff b/w V00-21 and V00-22 should be just the preinstall root check