Merge branch 'ecc-clean' into dev