OAK-1745 merged latest trunk