Merge "Allow system organizer to specify TF override orientation" into main