Afw test harness 2.1
merge in nyc-release history after reset to master