Merge branch 'mpic' into next