Merge "Fix range when printing OtherModesEnergyMilliJoule" into sc-dev