Merge branch '670-fix-flaky-test'