Merge pull request #127 from kazoompa/feature-OPAL-1726

feature-OPAL-1726