IDEA-25809 (9.0 Beta 1 CVS support flaky)