Apply recent changes to ORPL