Merge "Fix the build"