PSD-related tweaks
Merging this into master despite failures in test running because the tests are failing because of a cert issue, not as a result of the code itself (test cases passed in initial pull request out of fork)
Merging this into master despite failures in test running because the tests are failing because of a cert issue, not as a result of the code itself (test cases passed in initial pull request out of fork)