LPS-49619 Fix Trash + Upgrades