Merge remote-tracking branch 'remotes/origin/main' into 887-linux-warnings-when-compiled-on-ubuntu-22-04