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

Merge remote-tracking branch 'origin/main' into 853-mismatch-of-declaration-and-definition-of-computeintensityvector_ana-and

# Conflicts:
#	lib_com/options.h