different comments for COmmonProxy including the bug related to error showing
http://crucible.labs.intellij.net/cru/CR-IC-304#CFR-32519
Merge remote branch 'origin/master'