Merge "Improve "outdated trace" error message" into main