Merge remote-tracking branch 'origin/main' into float-1493-improve-stability-of-decisions-in-masa-metadata-reduction-in-encoder
