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