Merge branch 'consistent-part-test' into 19-weno-flux-contains-bug