code cleanup available as intentions (IDEA-38653)
Merge remote-tracking branch 'origin/master'
Postfix cleanup