Fixed for scaling issues.

Change-Id: I89fa75b0cbeed9a3e4494870d65534703b751c58
Merge topic 'expand_fragment_integration' into next

6ffb5e27 Fixed for scaling issues.
Fix window MPI compile error.

Change-Id: I2855b28576e3b67b1e77205beaed09f0a8b885f2
Merge topic 'expand_fragment_integration' into next

3c37b260 Fix window MPI compile error.