Merge branch 'ab/makefile-hook-list-dependency-fix'