Merge remote-tracking branch 'origin/main' into...
Merge remote-tracking branch 'origin/main' into 869-masa-pre-renderer-not-updating-energy-information-in-a-specific-case # Conflicts: # lib_com/options.h
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Merge remote-tracking branch 'origin/main' into 869-masa-pre-renderer-not-updating-energy-information-in-a-specific-case # Conflicts: # lib_com/options.h