same updates as for electric_dev: merge with new code from goa-tz, tested for electric and fuerte