Merge "Remove activeTrace tracking duplication." into main