Merge branch 'FCS_fixEnergy' into '21.0'

FCS Fix double counting of total energy in simulstate

See merge request !56230

(cherry picked from commit 4b58784c)

12f9bece fix double energy counting in simulstate
1 job for cherry-pick-4b58784cad3-22.0 in 0 seconds (queued for 1 minute and 6 seconds)