Merge: from main Also contains updated codegen binaries to conform with new API Tests: built all modes