OPAL-1869

Initial revision