Merge "Improve DEBUG logging of calls from trust agents" into main