Merge pull request #501 from jelmini/OAK-9704