sync with the Makefile fix on branch dev_zch, merged from dev_zch