Merge branch 'makefile' into v2
Merge branch 'v2' into net_test