Merge branch 'ec/diff-noprefix-config'