refs #10208. Fix issues raised in testing.
Merge branch 'feature/10208_lorentz_correction' into develop