Merge branch 'mogrify-orient' into 'develop'