Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev