Merge pull request #6192 from Faduf/bugfix_yupif7_orientation