disable hard consistency check
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
move to the right module
IDEA-127077 (incorrect parsing of type annotations)
Cleanup (formatting)