Merge "Fix SDNC flow Exception"