Merge branch 'ab/makefile-help-devs-more'