Merge remote-tracking branch 'remotes/origin/main' into 2222-leftovers-from-float-fixed-conversions