Not all commit revert "orientation, import, export changes"

This reverts commit f5c2ef5b4e3409e5fe052a0ad6c5c89056069a4c.