fixed NPE
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
IDEA-113670 Reformat+rearrange per-language setting [CR-IC-2682]