Merge "Fix broken trust agent reloading"