Merge "Modify HICN node"