Merge fix. Scale and orientation.