Merge "Fixing jsdt neon N&N"