Changes from PT
Revert "Changes from PT"

This reverts commit 03efd10d59f98ead936f14c0e319604f4398d195.
Revert "Revert "Changes from PT""

This reverts commit 993659f0ec3273c51f5b909e1cc049369d1c44b7.