PIM-1306 Updated oro platform