Merge branch 'hotfix-0.21'
Fixed image orientation problem
Merge branch 'hotfix-0.22' into develop