WINDUP-222b: merge