OPAL-1444

Completed implementation