Proxy minion support

Add proxy minion support, rebased from initial PR.