Merge remote-tracking branch 'origin/main' into...

Merge remote-tracking branch 'origin/main' into 1261-msan-in-masa-ext-metadata-delay-buffer-indexing-when-starting-with-bad-frames-and-no_delay_cmp

# Conflicts:
#	lib_com/options.h