Sync contrib to HEAD via Makefile
Sync ANFSRC to HEAD via Makefile