OPAL-2327 - code review changes
Merge pull request #479 from kazoompa/feature-OPAL-2327

OPAL-2327 - code review changes