a quickfix until we merge the commons proxy factory. see #270
Merge remote-tracking branch 'origin/quick-fix-proxy-factory' into fixes