Merge remote-tracking branch 'origin/main' into 869-masa-pre-renderer-not-updating-energy-information-in-a-specific-case # Conflicts: # lib_com/options.h
