Pull in latest flight build

Just to get all the improvements and optimisations that have been going on upstream.