Merge "Fix broken trust agent reloading v2"