Merge Release 25 -> Develop

Keeps the try-catches around unstable test cleanup in place (even though it should be slightly more stable in develop)