NEON-900/NEON-CR-99 code review changes