Merge branch 'ec-cleanup' into release