Also, IDEA-275483, IDEA-277336 are fixed by this change GitOrigin-RevId: 843a088a11074d8e254880e3cceaf666e6e72e83