Merge branch 'ecc-devel-mpg' into development