Merge "Improve content capture trace and prevent redundant works" into main