Merge "Modify CICN node"