fixes after merge
Merge remote-tracking branch 'jetbrains/master'