Merge branch 'sg/t3701-tighten-trace' into maint