[FABRIC-935] Placeholder Resolvers simplified