Fixed OWD-27726: orientation issues