synching changes from OCRE