PRIS-12 #comment Repairing CDAP