Merge pull request #6682 from nupplaphil/dfactory_fix