Merge "Prevent energy data overflow" into nyc-dev