Merge branch 'ec' into release