Merge pull request #518 from apache/OAK-9724