Merge branch 'jk/make-findstring-makeflags-fix'