Rotation related problems fix

- ASDK-2422