Add orientation fix for saving images
Merge branch 'hotfix/1.11.6'