HIP-669 code review changes with @arnony