CFY-352: Prefix resources - probably done