Implements #14
Fixes issue with proxy activation on runtime
Merge pull request #582 from emmanuel-keller/1.6

Implements #14