Merge remote-tracking branch 'remotes/origin/main' into 791-redundant-code-in-ivas_ism_metadata_close