OPAL-2343 - refactored