Update for upstream qbs