Remove Annotations
Merge remote-tracking branch 'origin/ECTest' into ECTest