PIM-1838 Updated oro platform