Merge pull request #513 from klcodanr/OAK-9717