Merge "Fix continuous build"