Merge "Fix SDNC initialization"