OPAL-2075 Merge in opal-1.x