Merge "Revert "fix the compilation error""