[windup-dev] EAP6-EAP7 migration