Branch 'v1.4' - Makefile