IDEA-105251
Merge remote-tracking branch 'origin/master'
EA-39114 (NPE)
remembering last injected language