Merge "Add a config option for trusts"