IDEA-125129 I would like to reopen IDEA-117698
(cherry picked from commit 7877bab)