Merge "Remove SCO flag from valid attributes check" into main