NEON-1029 code review NEON-CR-105