PA DSB here we go 2

Credits to PA
I cherry-picked from https://github.com/t4n017 as PA gerrit is down