No-op MPI tweak + comments.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  No-op MPI tweak + comments.