Merge "Remove obsolete `neon:` clause." into main