Merge "proxy_minion fix"