NEON-1024/NEON-CR-104 code review