Merge remote-tracking branch 'remotes/origin/main' into 1265-counter-overflow-in-ISM-metadata-BASOP