Fix for IDEA-81682, IDEA-1077?
Merge remote-tracking branch 'origin/master'