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