Applying commit eed7f584d39a967a5f4642fd806dbf985846e699 from idea-community
Applying commit 28de0f48aa11fcdc797832bd44cbccf0ea279654 from idea-community