Update from latest qbs