Merge object factory into master