PRT Upgrades for latest dash
Merge pull request #1464 from psav/prt_upgrade

[WIP] PRT Upgrades for latest dash