Merge remote-tracking branch 'origin/jakub.chrzanowski/IDEA-270005'