commit compat-neon024