Merge pull request #502 from jelmini/OAK-9704