Adding TPFactory
Merge pull request #10557 from mrevilme/master

Adding TPFactory