Renamed to SingletonFactory
Merge branch 'main' into client