Merge "Add traces for slow operations during unfold" into main