3e9c557a89
Swapped out the old method with new logic that sets the properties using reflection, and can also handle fields. (cherry picked from commit 026c8dec5fa5cffd09de438e43d74e18a480d907)