ref: refs/heads/1.4_neon_bugfix
