Merge "let's at least log the src mac as being the src mac, not the dst" into main