Muted flaky test
Merge branch 'release-2.0.0' into develop