(CFACT-117) Refacter registry access