Astromech Unit Build Shortages

[trapezoid76]

I have reservations for 2 of my grandchildren at the Droid Depot in Hollywood Studios and I know there was a recent shortage of R2 unit parts. Does anyone know if the RD2 parts shortage is over or if building a BB unit is still the only option?