Merge "EC_ADAPT: send updates for the correct nodes." into nextgenv2