How long until the SWF changes can be merged into mainline? I'd prefer to hold off on updating dependencies until we can be on the official branch of everything.