Merge "rename config-data=>sdnc"