OAK-9748 OAK-9748 address review comment