PRIS-12 #time 16h Moving logic up to DAF (CDAP,IRM)