Merge branch '869-masa-pre-renderer-not-updating-energy-information-in-a-specific-case' into 'main'

[Non-BE] Resolve #869: MASA pre-renderer not updating energy information in a specific case

See merge request !1275