Change to MPI initialisation to avoid unassigned pointer
Try again with const_cast
Merge branch 'chris/issue-384' into next