Merge "Update Makefile configuration"