Merge "EC_ADAPT: improved symbol adaptation." into nextgenv2