Merge branch 'ec' into test