[CJ-1133] add logic for ProxyDialog
Merge remote-tracking branch 'origin/master'