Merge branch 'ls/makefile-cflags-developer-tweak'