FIX: Across-thread usage of WrapperFactory.
Merge remote-tracking branch 'origin/roland' into manfred