OAK-1263 r1. initial implementation