Merge branch 'master' into ECC-INTEGRATION-2-1