OPAL-1443

Enhancement completed