merging first version which does validation tests OK, with mostly build chain updates for API versions