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

Merge remote-tracking branch 'origin/main' into 890-mismatch-of-the-expected-and-provided-function-argument-size-in-renderismtomasa

# Conflicts:
#	lib_com/options.h