OAK-1717 initial stub