Merge "Add missing trace points"