Merge "Fix NullPointerException in RotationHelper" into main