automerge: 98a8258 * commit '98a8258dd8759722b3aedce9297023291e33d724': Ensure trust agents are disabled in safe-mode