jhs/ec-upgrade