IDEA-99680 Proxy support in IDEA
Merge remote branch 'origin/master'