Merge "[GLOBAL] Fix Makefile typo" into guilin