Merge pull request #2918 from tnull/2024-03-prefer-from-over-into