Enhance non-determinism reporting and planning for 3.0.1

Ready to go. Passed jenkins.