Merge branch 'neon_ext' into neon