Fix the build after the merge from trunk