Merge "Fix warning on the build servers"