patch from Christian to allow use from JCA connector
Merge remote-tracking branch 'refs/remotes/upstream/master'