OPAL-21781

OPAL-21781