Merge "Add a workaround to prevent duplicate layers in traces" into main