Merge "Remove unnecessary `neon:`." into main