Update core/Makefile

Merge 4.2.2