Merge branch 'master' into develop
only check for drop in net energy if lastMeterID == meterID