Merge "sync restapi-call-node with ecomp"