Merge "Fix clippy::ptr-arg lint" into main