Thank you, Christian.

Code added in branch [ticket-6fbee320-local-ns-prefix].

I think the modification is ok.
It is hard to check without a test web service.

I will do some additional tests and merge.

Thank you,
Harald