Patch auto orient changes from 3.4.1