Merge "[COMAC-279] Fabric configuration to add NG40 node"