Merge "Improved trust error messaging (1/2)"