Merge "Make EffectFactory implementation thread-safe" into udc-qpr-dev