Merge "LSG: Fix Makefile"