*5868* Remove reliance on HandlerValiatorJournal and use ContextRequired policy instead