Merge pull request #561 from Ewocker/OAK-9758