Merge "Terminate Flow CPS-SDNR integration bug fix"