Support property_factory changed to resolve conflict in rebase