Merge "Make EffectFactory implementation thread-safe" into main