PSDLE - The big one

Sync with master: ffdcaf51004303c89b565d27832a900d35bf8b0e