Merge "Fix -Wnontrivial-memcall warning" into main