Merge pull request #540 from apache/OAK-9749