OAK-1263 integration with OAK-622

Integration with OAK-622